GtkAboutDialog: Fix a corner case of link highlighting

GtkAboutDialog highlights emails written as <...> and
urls written as http://... . gnome-terminal manages to
put <http://...> into its license text, which sadly
confuses the parser into running evolution on http://...

Fix things up far enough that <http://...> is now
recognized as url, and only the part inside the <> is
underlined (for email addresses, we include the <> in
the underline).

diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 3666e6be5d1312504de55843119748901527b7e4..04923647b84b43de63bdad9f79eba86da5fa1e67 100644 (file)
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -2045,14 +2045,14 @@ text_buffer_new (GtkAboutDialog  *about,
           r1 = strstr (q0, "http://");
           if (r1)
             {
-              r2 = strpbrk (r1, " \n\t");
+              r2 = strpbrk (r1, " \n\t>");
               if (!r2)
                 r2 = strchr (r1, '\0');
             }
           else
             r2 = NULL;
 
-          if (r1 && r2 && (!q1 || !q2 || (r1 < q1)))
+          if (r1 && r2 && (!q1 || !q2 || (r1 <= q1 + 1)))
             {
               q1 = r1;
               q2 = r2;